Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devel/llvm-morello-c18n: add based on devel/llvm-morello #193

Merged
merged 3 commits into from
Feb 20, 2025

Conversation

brooksdavis
Copy link
Member

Add a port of John's lld development branch. This version does not support the policy file, only the --compartment argument.

@kwitaszczyk
Copy link
Member

There are more changes required to allow the installation of llvm-morello and llvm-morello-c18n at the same time:

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index c6855d280205..0b79a36e0804 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=     [email protected]
 COMMENT?=      LLVM and Clang with support for the CHERI architecture
 WWW?=          https://cheri-cpu.org
 
-.if !defined(LLVM_SUFFIX) || ${LLVM_SUFFIX} == "-morello"
+.if !defined(LLVM_SUFFIX) || ${LLVM_SUFFIX:M-morello*}
 # XXX: really (LLVM_MAJOR < 16), but it's not defined here
 LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT
 .endif
diff --git a/devel/llvm-morello-c18n/Makefile b/devel/llvm-morello-c18n/Makefile
index 9b157dc22b76..e7cdaa1aec7e 100644
--- a/devel/llvm-morello-c18n/Makefile
+++ b/devel/llvm-morello-c18n/Makefile
@@ -1,6 +1,6 @@
-# llvm-morello
+# llvm-morello-c18n
 
-LLVM_SUFFIX=   -morello
+LLVM_SUFFIX=   -morello-c18n
 
 COMMENT=       LLVM and Clang with support the Arm Morello architecture
 WWW=           https://git.morello-project.org/morello/llvm-project
diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index 7e39afc3557b..84daacd5eaac 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -63,7 +63,7 @@ LLVM_MAJOR=${LLVM_SUFFIX}
 .error Don't know how to get version for ${LLVM_SUFFIX}
 .endif
 
-.if ${LLVM_SUFFIX} == "-cheri" || ${LLVM_SUFFIX} == "-cheriot" || ${LLVM_SUFFIX} == "-morello"
+.if ${LLVM_SUFFIX} == "-cheri" || ${LLVM_SUFFIX} == "-cheriot" || ${LLVM_SUFFIX:M-morello*}
 OPTIONS_EXCLUDE=       LLDB
 .endif
 

brooksdavis and others added 3 commits February 20, 2025 19:03
Add a port of John's lld development branch with early policy support.
I'd misunderstood the case where --start/end-no-unused-arguments were
needed in my previous commit.  Add a comment with the correct
explanation which is not future proofing, but instead that some
invocations of the compiler (e.g., clang -v) don't end up consuming
the -Xclang arguments.

Reported by:	jrtc27
Fixes:		1cf8031 devel/llvm-{cheri,morello}: future-proof ABI arguments

(cherry picked from commit 283c8d9)
FreeBSD's base llvm currently makes -Wimplicit-int and
-Wimplicit-function-declaration not produce errors by default  (see
c3450ad127e94d3fa67ae337310e59c002f51bfc) which means a chunk
of the ports collection depends on this behavior.  Until this is resolve
we need to mirror that behavior on CheriBSD.

Sponsored by:	DARPA, AFRL

(cherry picked from commit 91f85b5)
@brooksdavis
Copy link
Member Author

Thanks @kwitaszczyk, I believe I've applied those changes.

Copy link
Member

@kwitaszczyk kwitaszczyk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brooksdavis Thanks!

@kwitaszczyk kwitaszczyk merged commit 1fd4823 into main Feb 20, 2025
@kwitaszczyk kwitaszczyk deleted the llvm-morello-c18n branch February 20, 2025 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants